solace-agent-mesh 1.0.9__py3-none-any.whl → 1.3.0__py3-none-any.whl

solace_agent_mesh/gateway/http_sse/routers/artifacts.py

@@ -2,76 +2,81 @@
 FastAPI router for managing session-specific artifacts via REST endpoints.
 """
 
-from typing import (
-    List,
-    Dict,
-    Optional,
-    Union,
-    Any,
-    TYPE_CHECKING,
-)
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 from fastapi import (
     APIRouter,
     Depends,
-    HTTPException,
-    UploadFile,
     File,
+    Form,
+    HTTPException,
     Path,
+    UploadFile,
     status,
-    Form,
 )
-from fastapi.responses import StreamingResponse, Response
-from google.adk.artifacts import BaseArtifactService
+from fastapi.responses import Response, StreamingResponse
+
+try:
+    from google.adk.artifacts import BaseArtifactService
+except ImportError:
+
+    class BaseArtifactService:
+        pass
+
+
 import io
 import json
 from datetime import datetime, timezone
-from urllib.parse import urlparse, parse_qs, quote
-
-from ..dependencies import (
-    get_shared_artifact_service,
-    get_sac_component,
-    ensure_session_id,
-    get_user_id,
-    get_config_resolver,
-    get_user_config,
-)
+from urllib.parse import parse_qs, quote, urlparse
 
 from solace_ai_connector.common.log import log
 
+from ....common.a2a.types import ArtifactInfo
 from ....common.middleware import ConfigResolver
-from ....common.types import ArtifactInfo
-from ....common.utils.mime_helpers import is_text_based_mime_type
 from ....common.utils.embeds import (
-    resolve_embeds_recursively_in_string,
-    evaluate_embed,
     LATE_EMBED_TYPES,
+    evaluate_embed,
+    resolve_embeds_recursively_in_string,
+)
+from ....common.utils.mime_helpers import is_text_based_mime_type
+from ..dependencies import (
+    get_config_resolver,
+    get_sac_component,
+    get_session_validator,
+    get_shared_artifact_service,
+    get_user_config,
+    get_user_id,
 )
-
 
 if TYPE_CHECKING:
     from ....gateway.http_sse.component import WebUIBackendComponent
+
 from ....agent.utils.artifact_helpers import (
+    DEFAULT_SCHEMA_MAX_KEYS,
+    format_artifact_uri,
     get_artifact_info_list,
-    save_artifact_with_metadata,
     load_artifact_content_or_metadata,
-    DEFAULT_SCHEMA_MAX_KEYS,
+    save_artifact_with_metadata,
 )
 
 router = APIRouter()
 
 
 @router.get(
-    "/{filename}/versions",
-    response_model=List[int],
+    "/{session_id}/{filename}/versions",
+    response_model=list[int],
     summary="List Artifact Versions",
     description="Retrieves a list of available version numbers for a specific artifact.",
 )
 async def list_artifact_versions(
+    session_id: str = Path(
+        ..., title="Session ID", description="The session ID to get artifacts from"
+    ),
     filename: str = Path(..., title="Filename", description="The name of the artifact"),
     artifact_service: BaseArtifactService = Depends(get_shared_artifact_service),
     user_id: str = Depends(get_user_id),
-    session_id: str = Depends(ensure_session_id),
+    validate_session: Callable[[str, str], bool] = Depends(get_session_validator),
     component: "WebUIBackendComponent" = Depends(get_sac_component),
     config_resolver: ConfigResolver = Depends(get_config_resolver),
     user_config: dict = Depends(get_user_config),
@@ -90,6 +95,14 @@ async def list_artifact_versions(
     log_prefix = f"[ArtifactRouter:ListVersions:{filename}] User={user_id}, Session={session_id} -"
     log.info("%s Request received.", log_prefix)
 
+    # Validate session exists and belongs to user
+    if not validate_session(session_id, user_id):
+        log.warning("%s Session validation failed or access denied.", log_prefix)
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Session not found or access denied.",
+        )
+
     if artifact_service is None:
         log.error("%s Artifact service is not configured or available.", log_prefix)
         raise HTTPException(
@@ -133,23 +146,32 @@ async def list_artifact_versions(
         )
 
 
+@router.get(
+    "/{session_id}",
+    response_model=list[ArtifactInfo],
+    summary="List Artifact Information",
+    description="Retrieves detailed information for artifacts available for the specified user session.",
+)
 @router.get(
     "/",
-    response_model=List[ArtifactInfo],
+    response_model=list[ArtifactInfo],
     summary="List Artifact Information",
     description="Retrieves detailed information for artifacts available for the current user session.",
 )
 async def list_artifacts(
+    session_id: str = Path(
+        ..., title="Session ID", description="The session ID to list artifacts for"
+    ),
     artifact_service: BaseArtifactService = Depends(get_shared_artifact_service),
     user_id: str = Depends(get_user_id),
-    session_id: str = Depends(ensure_session_id),
+    validate_session: Callable[[str, str], bool] = Depends(get_session_validator),
     component: "WebUIBackendComponent" = Depends(get_sac_component),
     config_resolver: ConfigResolver = Depends(get_config_resolver),
     user_config: dict = Depends(get_user_config),
 ):
     """
     Lists detailed information (filename, size, type, modified date, uri)
-    for all artifacts associated with the current user and session ID
+    for all artifacts associated with the specified user and session ID
     by calling the artifact helper function.
     """
     if not config_resolver.is_feature_enabled(
@@ -160,6 +182,19 @@ async def list_artifacts(
     log_prefix = f"[ArtifactRouter:ListInfo] User={user_id}, Session={session_id} -"
     log.info("%s Request received.", log_prefix)
 
+    # Validate session exists and belongs to user
+    if not validate_session(session_id, user_id):
+        log.warning(
+            "%s Session validation failed for session_id=%s, user_id=%s",
+            log_prefix,
+            session_id,
+            user_id,
+        )
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Session not found or access denied.",
+        )
+
     if artifact_service is None:
         log.error("%s Artifact service is not configured or available.", log_prefix)
         raise HTTPException(
@@ -193,15 +228,18 @@ async def list_artifacts(
 
 
 @router.get(
-    "/{filename}",
+    "/{session_id}/{filename}",
     summary="Get Latest Artifact Content",
     description="Retrieves the content of the latest version of a specific artifact.",
 )
 async def get_latest_artifact(
+    session_id: str = Path(
+        ..., title="Session ID", description="The session ID to get artifacts from"
+    ),
     filename: str = Path(..., title="Filename", description="The name of the artifact"),
     artifact_service: BaseArtifactService = Depends(get_shared_artifact_service),
     user_id: str = Depends(get_user_id),
-    session_id: str = Depends(ensure_session_id),
+    validate_session: Callable[[str, str], bool] = Depends(get_session_validator),
     component: "WebUIBackendComponent" = Depends(get_sac_component),
     config_resolver: ConfigResolver = Depends(get_config_resolver),
     user_config: dict = Depends(get_user_config),
@@ -330,20 +368,23 @@ async def get_latest_artifact(
 
 
 @router.get(
-    "/{filename}/versions/{version}",
+    "/{session_id}/{filename}/versions/{version}",
     summary="Get Specific Artifact Version Content",
     description="Retrieves the content of a specific version of an artifact.",
 )
 async def get_specific_artifact_version(
+    session_id: str = Path(
+        ..., title="Session ID", description="The session ID to get artifacts from"
+    ),
     filename: str = Path(..., title="Filename", description="The name of the artifact"),
-    version: Union[int, str] = Path(
+    version: int | str = Path(
         ...,
         title="Version",
         description="The specific version number to retrieve, or 'latest'",
     ),
     artifact_service: BaseArtifactService = Depends(get_shared_artifact_service),
     user_id: str = Depends(get_user_id),
-    session_id: str = Depends(ensure_session_id),
+    validate_session: Callable[[str, str], bool] = Depends(get_session_validator),
     component: "WebUIBackendComponent" = Depends(get_sac_component),
     config_resolver: ConfigResolver = Depends(get_config_resolver),
     user_config: dict = Depends(get_user_config),
@@ -361,6 +402,14 @@ async def get_specific_artifact_version(
     log_prefix = f"[ArtifactRouter:GetVersion:{filename} v{version}] User={user_id}, Session={session_id} -"
     log.info("%s Request received.", log_prefix)
 
+    # Validate session exists and belongs to user
+    if not validate_session(session_id, user_id):
+        log.warning("%s Session validation failed or access denied.", log_prefix)
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Session not found or access denied.",
+        )
+
     if artifact_service is None:
         log.error("%s Artifact service is not configured or available.", log_prefix)
         raise HTTPException(
@@ -380,7 +429,7 @@ async def get_specific_artifact_version(
             version=version,
             load_metadata_only=False,
             return_raw_bytes=True,
-            log_identifier_prefix=f"[ArtifactRouter:GetVersion]",
+            log_identifier_prefix="[ArtifactRouter:GetVersion]",
         )
 
         if load_result.get("status") != "success":
@@ -403,7 +452,6 @@ async def get_specific_artifact_version(
         mime_type = load_result.get("mime_type", "application/octet-stream")
         resolved_version_from_helper = load_result.get("version")
         if data_bytes is None:
-
             log.error(
                 "%s Helper (with return_raw_bytes=True) returned success but no raw_bytes for '%s' v%s (resolved to %s).",
                 log_prefix,
@@ -528,7 +576,7 @@ async def get_artifact_by_uri(
     This allows fetching artifacts from any context, not just the current user's session,
     after performing an authorization check.
     """
-    log_id_prefix = f"[ArtifactRouter:by-uri]"
+    log_id_prefix = "[ArtifactRouter:by-uri]"
     log.info(
         "%s Received request for URI: %s from user: %s",
         log_id_prefix,
@@ -631,23 +679,26 @@ async def get_artifact_by_uri(
 
 
 @router.post(
-    "/{filename}",
+    "/{session_id}/{filename}",
     status_code=status.HTTP_201_CREATED,
-    response_model=Dict[str, Any],
+    response_model=dict[str, Any],
     summary="Upload Artifact (Create/Update Version with Metadata)",
     description="Uploads file content and optional metadata to create or update an artifact version.",
 )
 async def upload_artifact(
+    session_id: str = Path(
+        ..., title="Session ID", description="The session ID to upload artifacts to"
+    ),
     filename: str = Path(
         ..., title="Filename", description="The name of the artifact to create/update"
     ),
     upload_file: UploadFile = File(..., description="The file content to upload"),
-    metadata_json: Optional[str] = Form(
+    metadata_json: str | None = Form(
         None, description="JSON string of artifact metadata (e.g., description, source)"
     ),
     artifact_service: BaseArtifactService = Depends(get_shared_artifact_service),
     user_id: str = Depends(get_user_id),
-    session_id: str = Depends(ensure_session_id),
+    validate_session: Callable[[str, str], bool] = Depends(get_session_validator),
     component: "WebUIBackendComponent" = Depends(get_sac_component),
     config_resolver: ConfigResolver = Depends(get_config_resolver),
     user_config: dict = Depends(get_user_config),
@@ -664,13 +715,20 @@ async def upload_artifact(
         f"[ArtifactRouter:Post:{filename}] User={user_id}, Session={session_id} -"
     )
     log.info(
-        "%s Request received. Upload filename: '%s', content type: %s",
+        "%s Request received. Upload filename: '%s', content type: %s, Metadata provided: %s",
         log_prefix,
         upload_file.filename,
         upload_file.content_type,
-        f"Metadata provided: {bool(metadata_json)}",
     )
 
+    # Validate session exists and belongs to user
+    if not validate_session(session_id, user_id):
+        log.warning("%s Session validation failed or access denied.", log_prefix)
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Session not found or access denied.",
+        )
+
     if artifact_service is None:
         log.error("%s Artifact service is not configured or available.", log_prefix)
         raise HTTPException(
@@ -724,7 +782,7 @@ async def upload_artifact(
             ),
         )
 
-        if save_result["status"] in ["success", "partial_success"]:
+        if save_result["status"] == "success":
             log.info(
                 "%s Artifact and metadata processing completed. Data version: %s, Metadata version: %s. Message: %s",
                 log_prefix,
@@ -732,14 +790,28 @@ async def upload_artifact(
                 save_result.get("metadata_version"),
                 save_result.get("message"),
             )
+            saved_version = save_result.get("data_version")
+            artifact_uri = format_artifact_uri(
+                app_name=app_name,
+                user_id=user_id,
+                session_id=session_id,
+                filename=filename,
+                version=saved_version,
+            )
+            log.info(
+                "%s Successfully saved artifact. Returning URI: %s",
+                log_prefix,
+                artifact_uri,
+            )
             return {
                 "filename": filename,
-                "data_version": save_result.get("data_version"),
+                "data_version": saved_version,
                 "metadata_version": save_result.get("metadata_version"),
                 "mime_type": mime_type,
                 "size": len(content_bytes),
                 "message": save_result.get("message"),
                 "status": save_result["status"],
+                "uri": artifact_uri,
             }
         else:
             log.error(
@@ -763,24 +835,26 @@ async def upload_artifact(
             detail=f"Failed to save artifact: {str(e)}",
         )
     finally:
-
         await upload_file.close()
         log.debug("%s Upload file closed.", log_prefix)
 
 
 @router.delete(
-    "/{filename}",
+    "/{session_id}/{filename}",
     status_code=status.HTTP_204_NO_CONTENT,
     summary="Delete Artifact",
     description="Deletes an artifact and all its versions.",
 )
 async def delete_artifact(
+    session_id: str = Path(
+        ..., title="Session ID", description="The session ID to delete artifacts from"
+    ),
     filename: str = Path(
         ..., title="Filename", description="The name of the artifact to delete"
     ),
     artifact_service: BaseArtifactService = Depends(get_shared_artifact_service),
     user_id: str = Depends(get_user_id),
-    session_id: str = Depends(ensure_session_id),
+    validate_session: Callable[[str, str], bool] = Depends(get_session_validator),
     component: "WebUIBackendComponent" = Depends(get_sac_component),
     config_resolver: ConfigResolver = Depends(get_config_resolver),
     user_config: dict = Depends(get_user_config),
@@ -798,6 +872,14 @@ async def delete_artifact(
     )
     log.info("%s Request received.", log_prefix)
 
+    # Validate session exists and belongs to user
+    if not validate_session(session_id, user_id):
+        log.warning("%s Session validation failed or access denied.", log_prefix)
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Session not found or access denied.",
+        )
+
     if artifact_service is None:
         log.error("%s Artifact service is not configured or available.", log_prefix)
         raise HTTPException(
@@ -819,7 +901,6 @@ async def delete_artifact(
         return Response(status_code=status.HTTP_204_NO_CONTENT)
 
     except Exception as e:
-
         log.exception("%s Error deleting artifact: %s", log_prefix, e)
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,

solace_agent_mesh/gateway/http_sse/routers/config.py

@@ -7,7 +7,7 @@ from typing import Dict, Any
 
 from solace_ai_connector.common.log import log
 
-from ....gateway.http_sse.dependencies import get_sac_component
+from ....gateway.http_sse.dependencies import get_sac_component, get_api_config
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -19,6 +19,7 @@ router = APIRouter()
 @router.get("/config", response_model=Dict[str, Any])
 async def get_app_config(
     component: "WebUIBackendComponent" = Depends(get_sac_component),
+    api_config: Dict[str, Any] = Depends(get_api_config),
 ):
     """
     Provides configuration settings needed by the frontend application.
@@ -42,6 +43,7 @@ async def get_app_config(
                 "frontend_collect_feedback", False
             ),
             "frontend_bot_name": component.get_config("frontend_bot_name", "A2A Agent"),
+            "persistence_enabled": api_config.get("persistence_enabled", False),
         }
         log.info("%sReturning frontend configuration.", log_prefix)
         return config_data