Add session participants routes

agents-api/agents_api/queries/sessions/__init__.py

@@ -14,6 +14,8 @@
 from .create_session import create_session
 from .delete_session import delete_session
 from .get_session import get_session
+from .get_session_agents import get_session_agents
+from .get_session_users import get_session_users
 from .list_sessions import list_sessions
 from .patch_session import patch_session
 from .update_session import update_session
@@ -24,6 +26,8 @@
     "create_session",
     "delete_session",
     "get_session",
+    "get_session_agents",
+    "get_session_users",
     "list_sessions",
     "patch_session",
     "update_session",

agents-api/agents_api/queries/sessions/get_session_agents.py

@@ -0,0 +1,51 @@
+"""SQL query to fetch agents for a given session."""
+
+from uuid import UUID
+
+from beartype import beartype
+
+from ...autogen.openapi_model import Agent
+from ...common.utils.db_exceptions import common_db_exceptions
+from ...metrics.counters import query_metrics
+from ..utils import pg_query, rewrap_exceptions, wrap_in_class
+
+query = """
+SELECT
+    a.agent_id,
+    a.developer_id,
+    a.name,
+    a.canonical_name,
+    a.about,
+    a.instructions,
+    a.model,
+    a.metadata,
+    a.default_settings,
+    a.default_system_template,
+    a.created_at,
+    a.updated_at,
+    p.canonical_name AS project
+FROM session_lookup sl
+JOIN agents a ON sl.participant_id = a.agent_id
+    AND sl.developer_id = a.developer_id
+LEFT JOIN project_agents pa ON a.agent_id = pa.agent_id
+    AND a.developer_id = pa.developer_id
+LEFT JOIN projects p ON pa.project_id = p.project_id
+    AND pa.developer_id = p.developer_id
+WHERE sl.developer_id = $1
+  AND sl.session_id = $2
+  AND sl.participant_type = 'agent';
+"""
+
+
+@rewrap_exceptions(common_db_exceptions("session", ["get_agents"]))
+@wrap_in_class(Agent, transform=lambda d: {**d, "id": d["agent_id"]})
+@query_metrics("get_session_agents")
+@pg_query
+@beartype
+async def get_session_agents(*, developer_id: UUID, session_id: UUID) -> tuple[str, list]:
+    """Return SQL query to retrieve agents of a session."""
+
+    return (
+        query,
+        [developer_id, session_id],
+    )

agents-api/agents_api/queries/sessions/get_session_users.py

@@ -0,0 +1,46 @@
+"""SQL query to fetch users for a given session."""
+
+from uuid import UUID
+
+from beartype import beartype
+
+from ...autogen.openapi_model import User
+from ...common.utils.db_exceptions import common_db_exceptions
+from ...metrics.counters import query_metrics
+from ..utils import pg_query, rewrap_exceptions, wrap_in_class
+
+query = """
+SELECT
+    u.user_id,
+    u.developer_id,
+    u.name,
+    u.about,
+    u.metadata,
+    u.created_at,
+    u.updated_at,
+    p.canonical_name AS project
+FROM session_lookup sl
+JOIN users u ON sl.participant_id = u.user_id
+    AND sl.developer_id = u.developer_id
+LEFT JOIN project_users pu ON u.user_id = pu.user_id
+    AND u.developer_id = pu.developer_id
+LEFT JOIN projects p ON pu.project_id = p.project_id
+    AND pu.developer_id = p.developer_id
+WHERE sl.developer_id = $1
+  AND sl.session_id = $2
+  AND sl.participant_type = 'user';
+"""
+
+
+@rewrap_exceptions(common_db_exceptions("session", ["get_users"]))
+@wrap_in_class(User, transform=lambda d: {**d, "id": d["user_id"]})
+@query_metrics("get_session_users")
+@pg_query
+@beartype
+async def get_session_users(*, developer_id: UUID, session_id: UUID) -> tuple[str, list]:
+    """Return SQL query to retrieve users of a session."""
+
+    return (
+        query,
+        [developer_id, session_id],
+    )

agents-api/agents_api/routers/sessions/__init__.py

@@ -5,7 +5,9 @@
 from .create_session import create_session
 from .delete_session import delete_session
 from .get_session import get_session
+from .get_session_agents import get_session_agents
 from .get_session_history import get_session_history
+from .get_session_users import get_session_users
 from .list_sessions import list_sessions
 from .patch_session import patch_session
 from .render import render

agents-api/agents_api/routers/sessions/get_session_agents.py

@@ -0,0 +1,27 @@
+"""API endpoint to list agents for a session."""
+
+from typing import Annotated
+from uuid import UUID
+
+from fastapi import Depends
+
+from ...autogen.openapi_model import Agent, ListResponse
+from ...dependencies.developer_id import get_developer_id
+from ...queries.sessions.get_session_agents import (
+    get_session_agents as get_session_agents_query,
+)
+from .router import router
+
+
+@router.get("/sessions/{session_id}/agents", tags=["sessions"])
+async def get_session_agents(
+    session_id: UUID,
+    x_developer_id: Annotated[UUID, Depends(get_developer_id)],
+) -> ListResponse[Agent]:
+    """Return agents associated with the session."""
+
+    agents = await get_session_agents_query(
+        developer_id=x_developer_id,
+        session_id=session_id,
+    )
+    return ListResponse[Agent](items=agents)

agents-api/agents_api/routers/sessions/get_session_users.py

@@ -0,0 +1,25 @@
+"""API endpoint to list users for a session."""
+
+from typing import Annotated
+from uuid import UUID
+
+from fastapi import Depends
+
+from ...autogen.openapi_model import ListResponse, User
+from ...dependencies.developer_id import get_developer_id
+from ...queries.sessions.get_session_users import get_session_users as get_session_users_query
+from .router import router
+
+
+@router.get("/sessions/{session_id}/users", tags=["sessions"])
+async def get_session_users(
+    session_id: UUID,
+    x_developer_id: Annotated[UUID, Depends(get_developer_id)],
+) -> ListResponse[User]:
+    """Return users associated with the session."""
+
+    users = await get_session_users_query(
+        developer_id=x_developer_id,
+        session_id=session_id,
+    )
+    return ListResponse[User](items=users)

typespec/sessions/endpoints.tsp

@@ -1,6 +1,10 @@
+import "@typespec/http";
 import "../common";
+import "../agents/models.tsp";
+import "../users/models.tsp";
 import "./models.tsp";
 
+using TypeSpec.Http;
 using Common;
 
 namespace Sessions;
@@ -16,4 +20,16 @@ interface Endpoints
         UpdateEndpoint<UpdateSessionRequest, Session, "Update an existing session by its id (overwrites all existing values)">,
         PatchEndpoint<PatchSessionRequest, Session, "Update an existing session by its id (merges with existing values)">,
         DeleteEndpoint<"Delete a session by its id">,
-        GetEndpoint<Session, "Get a session by id"> {}
+        GetEndpoint<Session, "Get a session by id"> {
+
+    @route("agents")
+    @get
+    @doc("List agents associated with the session")
+    listAgents(): ListResponse<Agents.Agent>;
+
+    @route("users")
+    @get
+    @doc("List users associated with the session")
+    listUsers(): ListResponse<Users.User>;
+}
+